Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:34:44 +0000 (09:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:34:44 +0000 (09:34 -0700)

Trivial merge